Fixing waitonipg