fix former #7