Fixed TODO of __call method