comments related to checkRollState() early return fix