fix and add normal version