Fix for 2.2