Update for feature request #225