Fixed bug with lazy services