Fix Bug
Add some spec