Fixing major bug :)