fix dependency injection problem; TODO: controllers