master - NEW: fixing default attributes