fixed check_ calls