Re:ripe-159 changes