really fix #10 now