MAL-59 | fixed