Fixed a bug in interacting with shifts