address one part of #2143