initial adaptation: #MSG-300 fixed