better fix for spatial