bug fix and work-around for supervisor bug