Fixed #250, Fixed problem when sending commands from and to same endpoint