Finally fixed 'long' error also for 2.6 and 2.7