Implement fix for issue #105