more fixing to spaces