fix bug since last commit