Fix spacial issue