not sure this fix belongs to this patch; beware of side effects of renaming things :)