Hotfixing patch for 2989
Merge pull request #298 from goehle/hotfix

Hotfixing patch for 2989