Added special case for 'combined' directory