Workaround for MNBMODULE-215