Possible fix for issue 2005