Quick fix for 4.2