fixed bug: issue/12