Should fix #35