hopefully fixed compatability