try to fix bug #2
try to fix bug #2 (cont.)