Fix implementation

It would not properly stub validation methods