fix of last commit #4