Fix basedir initalization try 2