fix for issue 630