fixed bug #12