Fixed bug, still weird on restart
PLEASE BE FIXED