Issue#434 fix return

Closes #434
Closes #435