Added back line to prevent 'null' loading