Committing to resolve issue 74