better fix #25