Fixed buggy data when creating message