fix issues introduced by last commit