fixed issue/7