[ELF-111] temp workaround to get to the *point*