Return never returns.. fix it