SMOF fix