Fixed stuff.............

My previous commit had a conflict, so I attempted to fix it. This commit
is just to fix a small mistake of mine. Hopefully everything is still
here.