Temporal fix for making it work (@bmagyar will really fix it at some point).