Committing to resolve issue 120