Fix for 4.1