x0MRk's fix