removed null combinator fudge