fixed bug #24