Fixes [LF-8573]