Workaround for bug 39