Bug fix
Merge pull request #398 from ndomar/bugfix

Bugfix