Bug fix in Commands. Add test.