Scripts parsing bugs correction