Fixing Frames / Titan incompatibility