Bugfix: Another workaround.