FORM token addition bug fixed