Fix Bug. v1.1 Finished