Another fix for CDH4 compliance