Fixing empty space weirdness