Bug fix: messaging system did not properly recognize server context