Bug Fixes
Fixed Fatal Bug