Try and fix #7