AUTO-459 Fix