add additional default checks