Repaired http mapper