fixed custom message issue