fixed compatability breaks