Fix whilst setup and solution