fixed issues created by last commit