Fix for LM 2.30