fix for issue 1642