Manager - fixes #921