Utils: fixes for the same thing like last time.