Reverting back to old fixState for right now.