Fixed mapping handling
multiple passes