I've made this work nicer with 1.5.