fix for Platform 4.0.x