Fix spatial mapping