Added fix for collection update issue