Quick fix for issue #361