Fix bug resulting from changed command handling