implementation of feature request #1363