Fix Last #7 issue