POC-33 : fixed a bug which blocks saving the configuration