Close #371 - Always respect custom paths