FIX bugs with creation file