fixed handling of default attributes ...