Fix command line binding