fixed compatibility