Fix last major bug