- Fix fix for issue #335