Added noted bug in shift