core: start to re-implement broken feature