fix return types