temp fix for waiting bug