Fixed bugs with puzzle initialization
Fixed bugs with puzzle initialization