FIX: interpreter fixes for issue #825.