Update for ticket #1383 feature