Fixed : replace string with const