Fixed everify code