Adding a bug fix. dev-2.1