#87 fixed, will have to revisit