Fix bug with Waiting for folder