Issue #424 update controller code