ugly quick fix (refactor asap)