Minor issue: semaphore should empty now