Fixing service error
Merge https://github.com/tirider/jee-dst-ter