Minor modification for onmicomplete