const-ness issue resolved.