Fix issue #8 again