Implement fix for issue #120