adaptation for rivets 0.6.5