hack for #18