Fixed const correctness