bugfix for bump and message escaping