Fix on DSL parser