try to fix bug #2 (cont.)