MAL-28 | fix for comments