Fixing message format after removing language info