Add hack for #16.