Pull request 74 followup