Workaround versioning problems