More space fixing