Fixed syntax-mapper