Fix Haste runtime problem