Fixing Horizon incompatibility