Potential workaround for #21.