implementation of feature request #1423