Fixed behavior completion