Fixes an issue with service