Fixed:
    test and fixed bugs over