bug fix - issue with undefined attributes