Re-fix issue #7 load regression