Workaround for old incorrect messages