Quick fix for issue #556