Fix issue #28 and failed tests