MAL-24 | fixed