Once again fixed issue caused by merge