Fix check for external messages