better fix #40