fix for issue 1730