Adpated check to new syntax.