upgrade to commons 2.4