Resolved toggle bug