Added #41 enhancement.
Removed unnecessary field checks.