Fix to last patch
Patch for 2.1.1