Opal bug fix