Fixed #124, Avoided add again same command/event