Updated for source changes in 1.2