Then we can remove this hack, no?