This fix is the top priority now