fix for issue 6927