Reapply last bugfix