bug fix introduced by last commit...