Take care of #2144