fixed/avoided a bug