fixed feature request #141