Fix handling rap-around