fix so that normal path will work.