changed thread current against scoped storage