attempt for making this 3.1 ready