Updated to be compatible with Spring 3.2.4.RELEASE