Fixing major bug. Oops.