Added some check based on comments