DoC Bug workaround