uncomment && add const check