Fix for base-directory override