Improved wakeup robustness