Fixed paths again