Fixed message issue