Fix #776
minimum of control on server side added
merge fix 776