Fixing major bug