BUGFIX: generation messages