Should fix #99