And fix #1.