One more temporary kludge