Fix Versionable behavior