Fix top directory issue (again)