Added Dzmitry's version for testing.