as per feature request #7