HOTFIX: Backwards-compatiblity fix for #46