Fixes grabbing on command line