Fix manager part of #263