Partial fix, now all run but won't stop