Quick fix for issue #46.