Bug fix for 2.4.0-b4