A bit better support for oldies