Double controller

Ref: E794