Bug fix for 60ffe4f6c6664a571dd3d1436b3e22c151cefaf2.