Fixed base path cmds bug