Fix handle command