Fix for issue #459