fixed bug #30