Fix for static messages