fixed bugs with message kinds