Fixes the bug with Command and List command.