FIX: const correctness