#93 added condition to check constants