Fixed a big bug that was causing all kinds of extraneous diseases on load