fixed delegate
fixed commands being added twice