Change path logic slightly