Fixed case where terminator span was incorrectly being dropped