Temporary workaround, but now it somewhat works