Fixed problem with too much const