fixes LF-5532