Fixed #198. 'notify_when' does not need to be present.