Fixed exception, kind of