Should fix #42