Updated per Adam's request.

https://github.com/stoysnet/tickets/issues/1561