quick fix until cache catches up