temporary workaround, now it somewhat works