QUICKFIX - replace moment with momentify