Issue 654
Merge pull request #655 from AndreiH/prod_failure

Issue 654