Fixed reverting origin template