Loading issue fixed