Fixing mf-geoadmin3/issues/706

This PR addresses the mf-geoadmin3 issue https://github.com/geoadmin/mf-geoadmin3/issues/706.