really fix #10 ;-)