A fix for RF-13680