Fix regression introduced by demodularization process