fixed bug, #12