Fixed version with services