better compatibility with spring 2