Improved default behaviour.