[ControlPanel]: Issue #156 fixed