Added a bug future on a missing const check