Fix bug on access of empty collection in draw method for extra_data