Fix timing and return toggle state