Fix error

Except for the const issue