Fixed carlgo's ugly derp code! debug!