fixed major bug caused by me