Bugfix: ensure backwards compatibility