Fix to issue #58