Fixing bug when wait option is not enabled