fixed breaking changes in last commit