Handle Idle status better