Possible fix for issue 131