Update command handling: fix ticket #135