Removed not so useful value check