Reduce PEBKAC possibility