Data compilation bug fix