Should fix #33