fix #40-1