Fixed severe production problem

The issue #6 is now closed, next we will pull request to master.