puzzle fix v1.0