Rijesen issue #90