corrected return type matching messages