Merge fix for issue #551