Major Bug Fixing #2.