Fix return values after change of spec