Fix Twic and Rpleth case