Issue #424 update controller