Added check for base folders.