Fixed return value format