Rift Cutter fix 2 (please be the last)