Quick fix for issue #219