Workaround for bug #820