Removed unnecessary length check