Should fix #9