Workaround for #2262, from Barney Stratford