Fixed error as a result of #1563