Change callbacks order