fixed broken code after last commit