(PE-951) Return the single map instead of a vector