Update to onlyWhen. Bugfix.