Fix service controller factory