Try and fix #5