Add forgotten code and fix SOLVED state