#1494

And then this a function on the class