Quick fix for issue #477