Hope fix #73