Fixed 4.0 interface