Fix legacy support
Generally better behaviour.