More sophisticated checking