fixed very nasty issue in the Manager