Is this non-const version really needed??