Issue 1023735 3

may not need this