on-the-fly fixes