[Bug Fixes] Really terrible bugs :(

My bad