Should fix #82