modifications for icaruseu/mom-ca#165