Fixing State assignment for PS 1.6