Issue 1100740

There are so many functions using this