Applyed `return` fix (@celtric)