const seems to work fine here -- back out this change?