Fixing a major bug with last commit