Re #940 - added constants