Solved issues brought by previous commit preventing file from loading