Small fix in the command listeners, to make them listen only to their own command type.