BUG-FIX When collection is undefined check it with oher attributes