Fixes issue with shifts on primitive vectors and matrices