updated to be campatible w/ cdh4.2.0