WIP: Watchcollection fix