FIxed bugs