Fix for 4.2.2