Improved file loading (slower, but does not crash)