[FIX] issues caused by lib update