A fix for issue #3