fixed manager (for real this time)