Fixed buildMessage