Fix #7 apply to branches ex100 and ex110.