fixed bug#26