Bugfix for shift with 0