Issue #4608: Change the file calling sequence