Fix multiple xs processing - #125