fix of mapping