Bug fix - Fixed undefined property error