FIX: fixed methods of 9.2 again