Improved corrections. Now using '@' symbol in specs and added '=' correction