Possible fix for issue 84