clean, fix for of7