Resolves feature request #2438