Compliance bug fix