Message issue workaround