Fixed problem with nor-rest by upgrade