Don't return before waking up condition

Fixes #2220