ADEN-1361 Rubicon fix