Quick fix for issue #51