Committing to resolve issue 98