Bug fix : Keep return type synchronised between GUI and model