ver1 fix