Fixing issues that were FIXED FUCKING FOREVER AGO.

SERIOUSLY.

WHAT THE FUCK.

SRSLY.