Fixed problems with merge of pull request