Fixed MBL-10474