Workaround for bug #70