Fix for issue #344.