added temp solution for auto load feature