fix picking states