issue #36 rijesen