Bugfix for new version of Common