Initial attempt at fixing AE disconnects