Quick fix for issue #337