Fixed overriding default commands...