Fixed collectables, again