MBNK-534 - improved