Bugfix: ugly workaround