fix constant calls