Conforming to aivika-3.1.