Solved a problem where fallen back values were being sent to server

Signed-off-by: Miguel M. Almeida <miguelcma@cma-retina.lan>