fixed issue with shift