Fix calc service
Root scope fix