Slight adjustment to the state checking.
Removed call when the q drains.