Improvement for multiple check on weird paths.