FIXME this needs either to be optimized or not called anymore….