Fixed one more time the int and const issue :P