fix of last issue