Fix Bug and Add an unittest