Workaround for bug #135