fix for issue 49