A kludge, but good enough for now ;)