Implement fix for issue #2