possible fix for issue 360