removed last code duplication in Grid