Work around for bug #35.