context message issue fixed