Should fix #63