ticket:9 Fix command