Add fix for issue #4