fixed last commit #3