some quick fix