bugfix: double rais and undefined messages