fixed issue with timeout firing even when we didn't request a reset on scope state