Fix regression caused by GT-546 fix