RC3
fix return type