fixed shifting issues