Fix for issue #489