Added some check