Fix for M26. [PHONO-196]