fixed issue of last commit #6