Fixes RuntimeException: Cannot override frozen service issue