Add a fix for issue #3