Add chalksy's fix again