#136 fixed Nape rising issues