fix return and disable debug