fixed bug #27