Trying to fix a major bug