Fix bug with IDLE state...