Fixed double manager issue