Fixed the shifting issue