re-did changes for AUTO-824 bug