Added fix for serialization of location.