Fixes problems with save to collection flow.