Bug Fixed v2.2