Issue #8265 by tj: Added full path