A fix for base dir resolving