code changed for r2.0
hotfix fixed
changed fiel from 2.0