Fixed #1 : failure on switching between REST and HAL.