Subcontroller problem workaround

Subcontroller problem workaround, see https://github.com/wprl/baucis/issues/86