#386 Fixed comment
#386 Fixed storing message