Fix adjusting current service state in master

The same as #98 but this is merged to master