Fixed solution ending early