merget fix on path generation