Small change in logic: I (or someone) needs to review whether this should really happen on create too.