possible fix for issue 2