Workaround for invalid messages from before 2004