Removed unnecessary array checking