Removed a breaking 'When'.