Fixing the broken fix that I just fixed due to a previous fix... that was broken.