Fix return type
Make code easier to use