Fix USMap property order