Changed dealing with sleepy OPs