fixed pretty major bug