Another speculative fix... (OMS-345)