Fixing recursive bug around Equator and the Poles