apply @zzak's feedback