try to fix bug #11
please test