Fixing some state class