Fix harbored #7