fixed command handle