Test david fix circulator

fix from master