Should fix #68