#11 Fix Bug