#1285 Added helper function