messages commented fixes #40