Bug fixed in parsing