Added some more check