fixing shift