Fix offset addition for mixed spaces.