fix return thingie