[BugFix+1] More Close to [nonpassV2] branch. Welldone.