bug fix for last commit