fix issue with duplicated end messages
1.0.1