USe rtrim here as that it the meaning. This should unbreak the issues on 2.0.2 with CP