In favour of #678 - use supported class version