Committing to resolve issue 79