#7 Fixed constness