Fixed major bug