now really fix #25 :)