[MASSEMBLY-580] Fix