Made some improvements again. #1260