Issue #75 - last commit broke tests!