Better support for 5.3