Support NUCSPATIAL-37