Fix Bugs of #3

#3