Fixed: base dir reference