updated to be compatible w/ CDH4.2.0