Quick hack to fix take_imp_data() bug