Fix to issue #5