Handicap: per 3, fix #29 #30 #31