Slightly changed default behaviour