FIX: additional fixes for issue #385.