Bug fix: issue 94