Applied workaround for bug #231.