Fixed wait operational

Change-Id: I04f21da1c51fc8c2df013b59c1ac3ddcafa9ba8c