[MASSEMBLY-743] Fixed