Fix calc service