Parser bug fixed