Should fix #55