Krish's fix