Fixed a step in [KFSQA-677] so it will be more reliable.