closes #47 with no evil hack