#94 fixed, tests to follow