Preliminary quickfix for higher-order natives