Fixed a copy cath and changed the order of notifications.