Fix: uniform the return value