fix path and simplify