Additional checking added