Const-ness fix