Fixed paths issue