Fix to handle additional LC messages