Bugfix for :comment/:message confusion