Fixed service instantiation.