Enhancement requested in #14