fixing loading blocking issue