Bugfix for third-party registration