Update fix per ceetav's comments.