Should fix #72