workaround fetch issue