Possible fix for issue 270