Should fix #54