Make the message concrete
Fix a bug