Added compatibility fix for 2.2