[FIX] broken things after refatoring