okkez's fix