fixing more gugs