FIX bug#10