Fix command handler