Possible fix for issue 8