Fix for 4.2