Merge "Fixed use of wrong class constant"