fix return
fix format
Merge remote-tracking branch 'origin/isaac'