fixed bug #16