Hopefully fixed the exception we found earlier!