old fixes (remade)