Fixing major bug.