Yet another fix for recurring service error