Unnecessary field length check removed