Compatiblity fix