Finally fix #2.