trying to fix bug with last commit