fixes #1870: better fix that is message extractor friendly