added contants check
Merge branch 'constants'