Fix for issue #413