Un-double-fix #8