ADEN-1292 Fix a bug in a bug fix