Fix shifting for real this time.