Compiled from 449f75f - Fix the right shifting fix being overriden