Fixed 2D calculation