Fixed this handling in service instantiation