Fixed DI error: http://stackoverflow.com/a/24257085/1864167