quick update. Comments [MJ-318]